Reimplement constraint merging for correctness #13292
+185
−108
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.